Non Fast-Forward merge